(fill-paragraph):

Bind fill-paragraph-function to nil, if it doesn't do the job.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 3bafa4a82d673f1d66c463f7f568d40b572c184f..4f0d16ffc6835cf1f5750d0f8eee6fe2c9fcfdc1 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -572,7 +572,10 @@ argument to it), and if it returns non-nil, we simply return its value."
           (let ((function fill-paragraph-function)
                 fill-paragraph-function)
             (funcall function arg)))
-      (let ((before (point)))
+      (let ((before (point))
+           ;; If fill-paragraph is called recursively,
+           ;; don't give fill-paragraph-function a second chance.
+           fill-paragraph-function)
        (save-excursion
          (forward-paragraph)
          (or (bolp) (newline 1))